Reduce includes of gtktypeutils.h to a minimum

diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 6b93f32b84de8432b12f940afb640291487916fc..c22690ccb481d9b25b4faadb65f0edd521e5e792 100644 (file)
--- a/gtk/gtkactivatable.c
+++ b/gtk/gtkactivatable.c
@@ -263,7 +263,6 @@
 #include "config.h"
 #include "gtkactivatable.h"
 #include "gtkactiongroup.h"
-#include "gtktypeutils.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 705bfa4e80b1725152515c72cb31b652a4c0419d..920b4a4eae7ca3a64ecfd59c673a839321f1592e 100644 (file)
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -25,7 +25,6 @@
 #define __GTK_ACTIVATABLE_H__
 
 #include <gtk/gtkaction.h>
-#include <gtk/gtktypeutils.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index 57d5a0e06511737018cba93da7fce497cc5ac1f4..c0c4ccfa7732601b0e5ae77f1da9dc1118517e90 100644 (file)
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -48,7 +48,7 @@
 #include <math.h>
 #include "gtkarrow.h"
 #include "gtksizerequest.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 5fdf837a15b2391216eab010a35240d00c9c6f6e..24bdf1c392b94f0e90483dc2407d219590e200cc 100644 (file)
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -49,9 +49,9 @@
 #include "gtkbbox.h"
 
 #include "gtkorientable.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
-#include "gtktypeutils.h"
 
 #include "gtkintl.h"
 

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index fcf531618ac25acfddcb0c791e28e8b46213d666..80bcd8b252f283cfaf0520d74f37438459f90758 100644 (file)
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -33,8 +33,8 @@
 #include <gdkkeysyms.h>
 
 #include "gtkbindings.h"
-#include "gtkkeyhash.h"
 #include "gtktypeutils.h"
+#include "gtkkeyhash.h"
 #include "gtkwidget.h"
 #include "gtkrc.h"
 

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index e3c4b42e83e181e4b5b094286492d924d5ca377a..8c7f86705ed4b1ae6476c9d9bfe718509d902943 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -88,7 +88,7 @@
 #include "gtkbox.h"
 #include "gtkorientable.h"
 #include "gtksizerequest.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index d813fff4516354905231236c167134b415ebccd2..25c9fc2e5232efcd338091ab704493b63de58c97 100644 (file)
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -40,7 +40,6 @@
 
 #include "config.h"
 #include "gtkbuildable.h"
-#include "gtktypeutils.h"
 #include "gtkintl.h"
 
 

diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 50ed14cd1dd88302ee8b23380108b5460911ba0e..5f46026a5e1aeb5504ff4e9983b63851b84417e5 100644 (file)
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -26,7 +26,6 @@
 #define __GTK_BUILDABLE_H__
 
 #include <gtk/gtkbuilder.h>
-#include <gtk/gtktypeutils.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 11fe3c63f1203d4ed011ccd40cfd044435ce99ec..5ea15e3c6090c4d6b7a198a833ef553f26e38534 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -23,13 +23,12 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include "gtktypeutils.h"
 #include "gtkbuilderprivate.h"
 #include "gtkbuilder.h"
 #include "gtkbuildable.h"
 #include "gtkdebug.h"
 #include "gtkversion.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
 #include "gtkintl.h"
 
 

diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index f81d1c2d9c84d07b92c2e2a86f080cbe3b27fe55..e54f018fab2f820592d55fccf26402b14057e879 100644 (file)
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -53,6 +53,7 @@
 #include "gtkcelllayout.h"
 #include "gtkcellareabox.h"
 #include "gtkcellareaboxcontext.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 
 

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index e15323e830dca563d83db831cb71b179abb56b36..95f33406b85fa3778effe7b7ea7ad494ff7ea235 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -21,6 +21,7 @@
 #include "gtkcellrenderer.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
 

diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index bc63b5ea90c0fc5fbbc2ad71efcd2991d50157cf..034e40dba75455c4ce40920a77143d3716920eed 100644 (file)
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -32,7 +32,7 @@
 #include "gtkcellrendererspinner.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
 #include "gtkintl.h"
 
 

diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index e6591c9c01ad304f6c45dbe20dbe9e4b6ad30ad4..c26863ffc5e8ec04b720bdc60e93be46d395879b 100644 (file)
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -39,7 +39,7 @@
 #include "gtkhsv.h"
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
 #include "gtkintl.h"
 
 /* Default width/height */

diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index 2a3c761355945b43919d05f19b826f6dd573582c..dfc0dd6faa8677303231739930e5cbee3c825a13 100644 (file)
--- a/gtk/gtkorientable.c
+++ b/gtk/gtkorientable.c
@@ -25,7 +25,7 @@
 
 #include "gtkorientable.h"
 #include "gtkprivate.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
 #include "gtkintl.h"
 
 

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index d81868e52efca94c5c3e2d95b4c5e7516308fcf3..c23fd15a2ed217f80b93bdc0cf5432a8674ac6ce 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -37,6 +37,7 @@
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
 #include "gtkorientable.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"

diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c
index eb6e046f50c96b0c00aae5fa4a1e0cd359eb2f39..0ff0d9612c5d46eb31b2d36de6c5fb828fd0b6b8 100644 (file)
--- a/gtk/gtkscrollable.c
+++ b/gtk/gtkscrollable.c
@@ -63,8 +63,8 @@
 #include "config.h"
 
 #include "gtkscrollable.h"
-#include "gtktypeutils.h"
 #include "gtkprivate.h"
+#include "gtktypebuiltins.h"
 #include "gtkintl.h"
 
 G_DEFINE_INTERFACE (GtkScrollable, gtk_scrollable, G_TYPE_OBJECT)

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index c18e7de7e8e515c1f324f9be6ce1d5ac643b25ca..1614b6b9c21eb83acb984bcf9f877548889aff93 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -32,7 +32,6 @@
 #include "gtkscrollable.h"
 #include "gtkscrolledwindow.h"
 #include "gtkwindow.h"
-#include "gtktypeutils.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index e9e4978bbb628458df612795040366bd266139b6..5ce17e8b1481767a0587aa1376c18cb2858940cd 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -28,10 +28,10 @@
 #include "gtkrc.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
-#include "gtktypeutils.h"
 #include "gtkprivate.h"
 #include "gtkcssprovider.h"
 #include "gtksymboliccolor.h"
+#include "gtktypebuiltins.h"
 #include "gtkversion.h"
 
 #ifdef GDK_WINDOWING_X11

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index be24f64869c2233cc2c7be4b69d373eae1fcacc4..836b3da2a83eefe2b9a9bfbef3476e8910bd438f 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -24,6 +24,7 @@
 #include "gtkbuildable.h"
 #include "gtkcontainer.h"
 #include "gtkintl.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
 #include "gtkwidgetprivate.h"

diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index c9ce6e787a34bb1a9f7bbd7548aebf36878a407f..ccd8bc2bc9f14b91293da3d4f7869607e72efa7a 100644 (file)
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -27,7 +27,6 @@
 
 #include <gtk/gtkenums.h>
 #include <gtk/gtktreemodel.h>
-#include <gtk/gtktypeutils.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 7f7445f4d25f76a3e5dec5692a2d1d66b9aa89f7..dfa8f1552af96a60196477ecbd9729c4f7f9727d 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -30,8 +30,8 @@
 
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtktypeutils.h"
 #include "gtkscrollable.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"